x86: fix dom0 S3 when x2apic is used.
authorKeir Fraser <keir.fraser@citrix.com>
Thu, 18 Mar 2010 11:02:25 +0000 (11:02 +0000)
committerKeir Fraser <keir.fraser@citrix.com>
Thu, 18 Mar 2010 11:02:25 +0000 (11:02 +0000)
commit7f6331edab97a85e3ce722a5e3442b849db4891f
tree13bc1a3b24c542aa98e588ee8a7bd2fd128c5999
parentcaf500204f0cd52a0e1fb838029e52bafbfd072b
x86: fix dom0 S3 when x2apic is used.

1) Some variables and functions in xen/arch/x86/genapic/x2apic.c
should not be marked with __init* as they will be used during s3
resume;
2) In do_suspend_lowlevel -> restore_rest_processor_state ->
mcheck_init, lapic is accessed, but x2apic hasn't been re-enabled yet
(x2apic is re-enabled() in device_power_up -> lapic_resume). The patch
moves mcheck_init to a later place.

Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
xen/arch/x86/acpi/power.c
xen/arch/x86/acpi/suspend.c
xen/arch/x86/genapic/x2apic.c